From bc21e066d62f72a03a9e9b2ad5de57fe8e3b87d2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 7 Feb 2004 00:21:37 +0000 Subject: [PATCH] Don't use function calls in array initializers, as some compilers seem to Sat Feb 7 01:21:09 2004 Matthias Clasen * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function calls in array initializers, as some compilers seem to hate this. (#133216, Jonas Jonsson) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreemodel.c | 17 ++++++++++++----- 6 files changed, 42 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6da0977d3b..452bb682fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 7 01:21:09 2004 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function + calls in array initializers, as some compilers seem to hate this. + (#133216, Jonas Jonsson) + Sat Feb 7 00:06:44 2004 Matthias Clasen * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6da0977d3b..452bb682fe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Feb 7 01:21:09 2004 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function + calls in array initializers, as some compilers seem to hate this. + (#133216, Jonas Jonsson) + Sat Feb 7 00:06:44 2004 Matthias Clasen * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6da0977d3b..452bb682fe 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Feb 7 01:21:09 2004 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function + calls in array initializers, as some compilers seem to hate this. + (#133216, Jonas Jonsson) + Sat Feb 7 00:06:44 2004 Matthias Clasen * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6da0977d3b..452bb682fe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Feb 7 01:21:09 2004 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function + calls in array initializers, as some compilers seem to hate this. + (#133216, Jonas Jonsson) + Sat Feb 7 00:06:44 2004 Matthias Clasen * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6da0977d3b..452bb682fe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Feb 7 01:21:09 2004 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_model_base_init): Don't use function + calls in array initializers, as some compilers seem to hate this. + (#133216, Jonas Jonsson) + Sat Feb 7 00:06:44 2004 Matthias Clasen * gtk/gtkaccelmap.[hc]: Add change notification for GtkAccelMap, diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 7434efd156..c9be464097 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -130,11 +130,18 @@ gtk_tree_model_base_init (gpointer g_class) if (! initialized) { - GType row_inserted_params[] = { GTK_TYPE_TREE_PATH, GTK_TYPE_TREE_ITER }; - GType row_deleted_params[] = { GTK_TYPE_TREE_PATH }; - GType rows_reordered_params[] = { GTK_TYPE_TREE_PATH, - GTK_TYPE_TREE_ITER, - G_TYPE_POINTER }; + GType row_inserted_params[2]; + GType row_deleted_params[1]; + GType rows_reordered_params[3]; + + row_inserted_params[0] = GTK_TYPE_TREE_PATH; + row_inserted_params[1] = GTK_TYPE_TREE_ITER; + + row_deleted_params[0] = GTK_TYPE_TREE_PATH; + + rows_reordered_params[0] = GTK_TYPE_TREE_PATH; + rows_reordered_params[1] = GTK_TYPE_TREE_ITER; + rows_reordered_params[2] = G_TYPE_POINTER; tree_model_signals[ROW_CHANGED] = g_signal_new ("row_changed", -- 2.30.2